Skip to content

admin: set favorites as default Qubes menu - #1978

Merged
legoktm merged 1 commit into
mainfrom
admin-menu-favorites
Nov 16, 2026
Merged

legoktm merged 1 commit into
mainfrom
admin-menu-favorites

Conversation

@vickiniu

@vickiniu vickiniu commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor

Sets favorites as the defaults Qubes menu option.

Also fixes the keepassxc entry, adds an uninstall utility to revert the settings, and adds some tests.

Refs #1805

Test plan

make dev-admin from the branch and verify that

  • Qubes menu defaults to favorites
  • Admin launchers are shown in the favorites
  • Launching the admin tool favorites works as expected

Checklist

This change accounts for:

  • any necessary RPM packaging updates (e.g., added/removed files, see rpm-build/SPECS/securedrop-workstation-dom0-config.spec)
  • any required documentation

@vickiniu vickiniu moved this to In Progress in SecureDrop Nov 12, 2026
@vickiniu
vickiniu force-pushed the admin-menu-favorites branch from 67ed65e to bdc0a9f Compare November 13, 2026 16:55
@vickiniu
vickiniu marked this pull request as ready for review November 13, 2026 18:03
@vickiniu
vickiniu requested a review from a team as a code owner November 13, 2026 18:03
@vickiniu vickiniu moved this from In Progress to Ready For Review in SecureDrop Nov 13, 2026
@legoktm legoktm self-assigned this Nov 13, 2026
@legoktm legoktm added the 4.3-openqa-admin Run on OpenQA in Qubes 4.3 deploying the journalist workstation label Nov 13, 2026

@legoktm legoktm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously the menu-favorites were incorrectly set in dom0, so this properly sets them by the Qube that owns them, and fixes the keepassxc to be from admin-vault.

I don't think this was incorrect? I think we specifically want people to go through the dom0 .desktop files because that runs through the launcher/updater whereas the direct VM entries won't do that.

@legoktm legoktm moved this from Ready For Review to Under Review in SecureDrop Nov 13, 2026
@legoktm legoktm changed the title [wip] admin: set favorites as default Qubes menu admin: set favorites as default Qubes menu Nov 13, 2026
@vickiniu
vickiniu force-pushed the admin-menu-favorites branch from 95dc60a to 4e79731 Compare November 16, 2026 13:53
@vickiniu

Copy link
Copy Markdown
Contributor Author

@legoktm right, thank you! sorry I totally forgot the context there. reverted that change, but the favorites menu setting is now ready for a pass!

@vickiniu
vickiniu requested a review from legoktm November 16, 2026 14:42
@vickiniu vickiniu moved this from Under Review to Ready For Review in SecureDrop Nov 16, 2026

@legoktm legoktm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works great; two comments about improving uninstall + tests but that can be done in follow-ups.

Comment thread securedrop_manage/main.py
def revert_admin_dom0_menu() -> None:
"""
Undo the dom0 app menu settings applied by admin_salt.sd-admin, leaving
alone any that have since been changed to something else.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we really need to worry about this, just because on each dom0 salt run (updater), it's going to override any user customized changes anyways. So I think we could just unconditionally unset these.

Since this is just for uninstall code I'll leave it for a follow-up.

Comment thread tests/test_vm_sd_admin.py
favorites = all_vms["dom0"].features.get("menu-favorites", "")
assert favorites == manage.ADMIN_DOM0_MENU_FEATURES["menu-favorites"]
# No favorites on the qubes themselves, which would bypass sdw-updater
for vm in ("sd-admin", "sd-admin-vault"):

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice, maybe this should be for all VMs?

@legoktm
legoktm added this pull request to the merge queue Nov 16, 2026
Merged via the queue into main with commit 4b0556f Nov 16, 2026
14 checks passed
@github-project-automation github-project-automation Bot moved this from Ready For Review to Done in SecureDrop Nov 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.3-openqa-admin Run on OpenQA in Qubes 4.3 deploying the journalist workstation

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants